From c127d524bfce9393e42875bf31e7e20959ae4294 Mon Sep 17 00:00:00 2001 From: Anton Gladky Date: Tue, 23 Nov 2021 22:14:16 +0100 Subject: [PATCH] Fix compilation --- debian/control | 1 + debian/libvtk9-dev.install | 4 ++-- debian/libvtk9-doc.docs | 3 +-- debian/libvtk9-java.install | 4 ++-- debian/libvtk9-java.manpages | 4 ++-- debian/libvtk9-qt-dev.install | 4 ++-- .../{vtkParseJava-9.0.1 => vtkParseJava-9.1} | 0 ...nGLVersion-9.0.1 => vtkProbeOpenGLVersion-9.1} | 0 ...tkWrapHierarchy-9.0.1 => vtkWrapHierarchy-9.1} | 0 .../{vtkWrapJava-9.0.1 => vtkWrapJava-9.1} | 0 .../{vtkWrapPython-9.0.1 => vtkWrapPython-9.1} | 0 ...WrapPythonInit-9.0.1 => vtkWrapPythonInit-9.1} | 0 .../manpages/{vtkpython-9.0.1 => vtkpython-9.1} | 0 debian/patches/10_matplotlib.patch | 10 +++++----- debian/patches/fix_ftbfs.patch | 15 +++++++++++++++ debian/patches/series | 15 ++++++++------- debian/python3-vtk9.install | 4 ++-- debian/python3-vtk9.manpages | 6 +++--- debian/rules | 3 ++- debian/vtk9-doc.docs | 2 +- debian/vtk9.install | 4 ++-- debian/vtk9.manpages | 4 ++-- 22 files changed, 50 insertions(+), 33 deletions(-) rename debian/manpages/{vtkParseJava-9.0.1 => vtkParseJava-9.1} (100%) rename debian/manpages/{vtkProbeOpenGLVersion-9.0.1 => vtkProbeOpenGLVersion-9.1} (100%) rename debian/manpages/{vtkWrapHierarchy-9.0.1 => vtkWrapHierarchy-9.1} (100%) rename debian/manpages/{vtkWrapJava-9.0.1 => vtkWrapJava-9.1} (100%) rename debian/manpages/{vtkWrapPython-9.0.1 => vtkWrapPython-9.1} (100%) rename debian/manpages/{vtkWrapPythonInit-9.0.1 => vtkWrapPythonInit-9.1} (100%) rename debian/manpages/{vtkpython-9.0.1 => vtkpython-9.1} (100%) create mode 100644 debian/patches/fix_ftbfs.patch diff --git a/debian/control b/debian/control index 904a08448..e055683e3 100644 --- a/debian/control +++ b/debian/control @@ -65,6 +65,7 @@ Build-Depends: chrpath, python3-matplotlib, python3-mpi4py, qtbase5-dev, + qtdeclarative5-dev, r-base-core, r-base-dev, r-base, diff --git a/debian/libvtk9-dev.install b/debian/libvtk9-dev.install index 733942fa5..0efd0a5d7 100644 --- a/debian/libvtk9-dev.install +++ b/debian/libvtk9-dev.install @@ -1,3 +1,3 @@ -usr/include/vtk-9.0 usr/include +usr/include/vtk-9.1 usr/include usr/lib/*/*.so -usr/lib/*/cmake/vtk-9.0 +usr/lib/*/cmake/vtk-9.1 diff --git a/debian/libvtk9-doc.docs b/debian/libvtk9-doc.docs index d384909a4..8d0303d0b 100644 --- a/debian/libvtk9-doc.docs +++ b/debian/libvtk9-doc.docs @@ -1,2 +1 @@ - -usr/share/doc/vtk-9.0/doxygen/* /usr/share/vtk-9.0/doxygen/ +usr/share/doc/vtk-9.1/doxygen/* /usr/share/vtk-9.1/doxygen/ diff --git a/debian/libvtk9-java.install b/debian/libvtk9-java.install index 015479eab..a0e7f6091 100644 --- a/debian/libvtk9-java.install +++ b/debian/libvtk9-java.install @@ -1,4 +1,4 @@ -usr/bin/vtkParseJava-9.0 usr/bin -usr/bin/vtkWrapJava-9.0 usr/bin +usr/bin/vtkParseJava-9.1 usr/bin +usr/bin/vtkWrapJava-9.1 usr/bin usr/lib/*/java/vtk9.jar usr/share/java usr/lib/*/java/vtk-L* diff --git a/debian/libvtk9-java.manpages b/debian/libvtk9-java.manpages index f2b1d00e6..2a3e048b8 100644 --- a/debian/libvtk9-java.manpages +++ b/debian/libvtk9-java.manpages @@ -1,2 +1,2 @@ -debian/manpages/vtkParseJava-9.0.1 -debian/manpages/vtkWrapJava-9.0.1 +debian/manpages/vtkParseJava-9.1 +debian/manpages/vtkWrapJava-9.1 diff --git a/debian/libvtk9-qt-dev.install b/debian/libvtk9-qt-dev.install index b68a64947..0654fa61d 100644 --- a/debian/libvtk9-qt-dev.install +++ b/debian/libvtk9-qt-dev.install @@ -1,3 +1,3 @@ usr/lib/*/*Qt*.so -usr/include/vtk-9.0/*Qt* -usr/include/vtk-9.0/Q* +usr/include/vtk-9.1/*Qt* +usr/include/vtk-9.1/Q* diff --git a/debian/manpages/vtkParseJava-9.0.1 b/debian/manpages/vtkParseJava-9.1 similarity index 100% rename from debian/manpages/vtkParseJava-9.0.1 rename to debian/manpages/vtkParseJava-9.1 diff --git a/debian/manpages/vtkProbeOpenGLVersion-9.0.1 b/debian/manpages/vtkProbeOpenGLVersion-9.1 similarity index 100% rename from debian/manpages/vtkProbeOpenGLVersion-9.0.1 rename to debian/manpages/vtkProbeOpenGLVersion-9.1 diff --git a/debian/manpages/vtkWrapHierarchy-9.0.1 b/debian/manpages/vtkWrapHierarchy-9.1 similarity index 100% rename from debian/manpages/vtkWrapHierarchy-9.0.1 rename to debian/manpages/vtkWrapHierarchy-9.1 diff --git a/debian/manpages/vtkWrapJava-9.0.1 b/debian/manpages/vtkWrapJava-9.1 similarity index 100% rename from debian/manpages/vtkWrapJava-9.0.1 rename to debian/manpages/vtkWrapJava-9.1 diff --git a/debian/manpages/vtkWrapPython-9.0.1 b/debian/manpages/vtkWrapPython-9.1 similarity index 100% rename from debian/manpages/vtkWrapPython-9.0.1 rename to debian/manpages/vtkWrapPython-9.1 diff --git a/debian/manpages/vtkWrapPythonInit-9.0.1 b/debian/manpages/vtkWrapPythonInit-9.1 similarity index 100% rename from debian/manpages/vtkWrapPythonInit-9.0.1 rename to debian/manpages/vtkWrapPythonInit-9.1 diff --git a/debian/manpages/vtkpython-9.0.1 b/debian/manpages/vtkpython-9.1 similarity index 100% rename from debian/manpages/vtkpython-9.0.1 rename to debian/manpages/vtkpython-9.1 diff --git a/debian/patches/10_matplotlib.patch b/debian/patches/10_matplotlib.patch index b917377a4..c7e78fb47 100644 --- a/debian/patches/10_matplotlib.patch +++ b/debian/patches/10_matplotlib.patch @@ -1,9 +1,9 @@ Description: _matplotlib -Index: VTK-9.0.1/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h +Index: VTK-9.1.0/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h =================================================================== ---- VTK-9.0.1.orig/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h -+++ VTK-9.0.1/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h -@@ -151,6 +151,10 @@ private: +--- VTK-9.1.0.orig/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h ++++ VTK-9.1.0/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h +@@ -197,6 +197,10 @@ private: * to implement IsAvailable. */ static Availability CheckMPLAvailability(); @@ -12,5 +12,5 @@ Index: VTK-9.0.1/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h + MPLMathTextAvailable = UNAVAILABLE; + }; - //@{ + ///@{ /** diff --git a/debian/patches/fix_ftbfs.patch b/debian/patches/fix_ftbfs.patch new file mode 100644 index 000000000..630b3ced1 --- /dev/null +++ b/debian/patches/fix_ftbfs.patch @@ -0,0 +1,15 @@ +Description: Fix FTBFS +Author: Anton Gladky +Last-Update: 2021-11-14 + +--- vtk9-9.1.0+dfsg1.orig/CMake/vtkCompilerExtraFlags.cmake ++++ vtk9-9.1.0+dfsg1/CMake/vtkCompilerExtraFlags.cmake +@@ -3,7 +3,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) + include(CheckCXXCompilerFlag) + + # Additional warnings for GCC +- set(CMAKE_CXX_FLAGS_WARN "-Wnon-virtual-dtor -Wno-long-long -ansi -Wcast-align -Wchar-subscripts -Wall -Wextra -Wpointer-arith -Wformat-security -Woverloaded-virtual -Wshadow -Wunused-parameter -fno-check-new -fno-common -Werror=undef") ++ set(CMAKE_CXX_FLAGS_WARN "-Wnon-virtual-dtor -Wno-long-long -ansi -Wcast-align -Wchar-subscripts -Wall -Wextra -Wpointer-arith -Wformat-security -Woverloaded-virtual -Wshadow -Wunused-parameter -fno-check-new -fno-common") + + # This flag is useful as not returning from a non-void function is an error + # with MSVC, but it is not supported on all GCC compiler versions diff --git a/debian/patches/series b/debian/patches/series index 3ebf461ba..174092621 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,13 +4,14 @@ 40_vtkpython-9.patch 50_fix_python-modules_path.patch 60_fix_path_perl.patch -70_fix_python_numpy_warning.patch -80_allow_gles_platforms.patch -81_allow_gles_platforms.patch -82_allow_gles_platforms.patch -83_allow_gles_platforms.patch -91_include_limits.patch -92_proj8.patch +#70_fix_python_numpy_warning.patch +#80_allow_gles_platforms.patch +#81_allow_gles_platforms.patch +#82_allow_gles_platforms.patch +#83_allow_gles_platforms.patch +#91_include_limits.patch +#92_proj8.patch 95_java_mach-arch_fix.patch 97_reproducible_builds.patch 98_fix_mpi4py.py +fix_ftbfs.patch diff --git a/debian/python3-vtk9.install b/debian/python3-vtk9.install index 5e635d887..607890b3d 100644 --- a/debian/python3-vtk9.install +++ b/debian/python3-vtk9.install @@ -1,5 +1,5 @@ usr/lib/python3 usr/bin/pvtkpython usr/bin/vtkpython-9.0 -usr/bin/vtkWrapPython-9.0 -usr/bin/vtkWrapPythonInit-9.0 +usr/bin/vtkWrapPython-9.1 +usr/bin/vtkWrapPythonInit-9.1 diff --git a/debian/python3-vtk9.manpages b/debian/python3-vtk9.manpages index c8798d1ff..b7d585d08 100644 --- a/debian/python3-vtk9.manpages +++ b/debian/python3-vtk9.manpages @@ -1,3 +1,3 @@ -debian/manpages/vtkWrapPython-9.0.1 -debian/manpages/vtkWrapPythonInit-9.0.1 -debian/manpages/vtkpython-9.0.1 +debian/manpages/vtkWrapPython-9.1 +debian/manpages/vtkWrapPythonInit-9.1 +debian/manpages/vtkpython-9.1 diff --git a/debian/rules b/debian/rules index 819a0b708..5e97368b8 100755 --- a/debian/rules +++ b/debian/rules @@ -32,6 +32,7 @@ extra_flags += \ -DVTK_EXTRA_COMPILER_WARNINGS=ON \ -DVTK_GROUP_ENABLE_Qt:STRING="YES" \ -DVTK_MODULE_ENABLE_VTK_GUISupportQtSQL:STRING="NO" \ + -DVTK_MODULE_ENABLE_VTK_GUISupportQtQuick:STRING="DONT_WANT" \ -DVTK_GROUP_ENABLE_Rendering:STRING="YES" \ -DVTK_GROUP_ENABLE_StandAlone:STRING="YES" \ -DVTK_GROUP_ENABLE_Views:STRING="YES" \ @@ -91,7 +92,7 @@ ifneq ($(JAVA_HOME),) # Correct headers for paraview mv $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/java/vtk.jar $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/java/vtk9.jar endif - sed -i -e "s/FATAL_ERROR/STATUS/g" $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/vtk-9.0/VTK-targets.cmake + sed -i -e "s/FATAL_ERROR/STATUS/g" $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/vtk-9.1/VTK-targets.cmake execute_after_dh_install: rm -rf $(CURDIR)/debian/tmp/usr/share/licenses diff --git a/debian/vtk9-doc.docs b/debian/vtk9-doc.docs index dba89dfb0..3cdba6c33 100644 --- a/debian/vtk9-doc.docs +++ b/debian/vtk9-doc.docs @@ -1,2 +1,2 @@ -debian/tmp/usr/share/doc/vtk-9.0/doxygen +debian/tmp/usr/share/doc/vtk-9.1/doxygen debian/build/Utilities/Doxygen/doc/html diff --git a/debian/vtk9.install b/debian/vtk9.install index 30059ddd8..c216fad72 100644 --- a/debian/vtk9.install +++ b/debian/vtk9.install @@ -1,2 +1,2 @@ -usr/bin/vtkWrapHierarchy-9.0 -usr/bin/vtkProbeOpenGLVersion-9.0 +usr/bin/vtkWrapHierarchy-9.1 +usr/bin/vtkProbeOpenGLVersion-9.1 diff --git a/debian/vtk9.manpages b/debian/vtk9.manpages index 9565d6264..0978fb401 100644 --- a/debian/vtk9.manpages +++ b/debian/vtk9.manpages @@ -1,2 +1,2 @@ -debian/manpages/vtkWrapHierarchy-9.0.1 -debian/manpages/vtkProbeOpenGLVersion-9.0.1 +debian/manpages/vtkWrapHierarchy-9.1 +debian/manpages/vtkProbeOpenGLVersion-9.1 -- 2.30.2